Skip to content

Conversation

clubby789
Copy link
Contributor

Fixes #112074

Unfortunately a big chunk of the diff is adding PartialEq/Eq/Debug impls so we can assert_eq but I think better to have them in the long run.
For back compat, ensure "maintainer", "user" and "dist" are all parsed as Profile::Dist.

r? @jyn514
cc @AnakinSkywalkeer who worked on the previous attempt at this

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 26, 2023
@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 26, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the bootstrap-user-to-dist branch from 4d74d73 to c195899 Compare June 26, 2023 20:17
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, this looks good! r=me with or without the nit fixed :)

@rust-cloud-vms rust-cloud-vms bot force-pushed the bootstrap-user-to-dist branch from c195899 to 85c4ea0 Compare June 26, 2023 22:55
@jyn514
Copy link
Member

jyn514 commented Jun 27, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 27, 2023

📌 Commit 85c4ea0 has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112518 (Detect actual span for getting unexpected token from parsing macros)
 - rust-lang#112978 (Add suggestion for bad block fragment error)
 - rust-lang#113068 (bootstrap: rename 'user' profile to 'dist')
 - rust-lang#113079 (Use `CoverageKind::as_operand_id` instead of manually reimplementing it)
 - rust-lang#113089 (Export AnalysisResults trait in rustc_mir_dataflow)
 - rust-lang#113093 (`thir`: Add `Become` expression kind)
 - rust-lang#113096 (Remove unused struct and tweak format macro uses)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1153aba into rust-lang:master Jun 27, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bootstrap: Rename profile = user to profile = dist
4 participants